integral/models.py

@@ -4,6 +4,8 @@ from django.db import models

                 from django.utils.translation import ugettext_lazy as _
              

                 from django_models_ext import BaseModelMixin, upload_path
              

                 
              

                +from mch.models import ModelInfo
              

                +
              

                 
              

                 class SaleclerkIntegralIncomeExpensesInfo(BaseModelMixin):
              

                     INCOME = 0
              
@@ -54,10 +56,19 @@ class SaleclerkIntegralIncomeExpensesInfo(BaseModelMixin):

                         return unicode(self.pk)
              

                 
              

                     @property
              

                +    def model_info(self):
              

                +        try:
              

                +            info = ModelInfo.objects.get(model_id=self.model_id).fulldata
              

                +        except ModelInfo.DoesNotExist:
              

                +            info = {}
              

                +        return info
              

                +
              

                +    @property
              

                     def data(self):
              

                         return {
              

                             'type': self.type,
              

                             'integral': self.integral,
              

                +            'model_info': self.model_info,
              

                             'modelName': self.model_name,
              

                             'serialNo': self.code,
              

                             'created_at': self.created_at,